Clean up attribute apis based on api council feedback.

Bug: 127714248
Test: None
Change-Id: I40596a88e7e446c6a25f2b9074bb88a0a417ed63
5 files changed