[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: f3dee21f -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 ea8f185b is in history
Change-Id: Icebeb1f37d9dc7163369a82378e3fe750c9922a9