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