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