[automerger skipped] Merge "Update system APIs based on feedback." am:...

[automerger skipped] Merge "Update system APIs based on feedback." am: 0cf48623 am: 7f5e2c32 am: 8c60f910 -s ours am: af0a1d8b -s ours

am skip reason: Merged-In I28456b5f1e155cef1e8fc3f4f9f500c9d8dc26f4 with SHA-1 0978799c is already in history

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



Change-Id: I26763f4e435fafaa119f950c3ad8cb0381ea8e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>