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