[automerger skipped] Merge "Update system APIs based on feedback." am: 0cf48623fc am: 7f5e2c32cc am: 8c60f91088 -s ours am: af0a1d8b4a -s ours
am skip reason: Merged-In I28456b5f1e155cef1e8fc3f4f9f500c9d8dc26f4 with SHA-1 0978799c26 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2472724
Change-Id: Ifc45231e641fc00927114a24791fc6bdc4828f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: