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