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