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