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