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