[automerger skipped] [SP21] Address comments for API council review about...
[automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: ea8f185b am: af679c10 -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 ea8f185b is in history
Change-Id: I778c34aed7223a82d8c0238aaf7995bd4171a2c2