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