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