[automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: ea8f185b52 -s ours

am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 393e10d4cd is in history

Change-Id: I80ab45b6a34b66f1bed766b3e2fb72926325021e