Merge "Update system APIs based on feedback." am: 1ae5b8e8 am: 07b95a8a...

Merge "Update system APIs based on feedback." am: 1ae5b8e8 am: 07b95a8a am: 9b57c55f am: 6d406692 am: d8eb0f8d

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



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