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