[automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a -s ours am: 180557c20a -s ours am: 76a9658f9e -s ours am: 809ac22e18 -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 f8660076c0 is in history
Change-Id: Id1ee0b834ff1f6ec0e79316657e8a87e393605c1
This commit is contained in: