Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2176683 Change-Id: I1d362eba5c9632c8bab73f9bd4f526a55b47ac61 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>