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