Merge "Update system APIs based on feedback." into udc-dev am: 6f655212

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



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