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