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