[automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 4aa86b782b -s ours am: 2770b697e8 -s ours am: 0d3b23946a -s ours am: e79d222269 -s ours

am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 5752baa6b6 is in history

Change-Id: Id1ee0b834ff1f6ec0e79316657e8a87e393605c1