[automerger skipped] Merge "Address API review feedback" am: 13e89b75 am: 9d2158a9 am: 786bf2e9 -s ours

am skip reason: skip tag Change-Id I5e8c4bed8bda40d507afa894c359b5e24ee5d868 with SHA-1 11f5e63b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679763

Change-Id: I859b0bd64ce3c38693e19209783bcdf91a562ef2