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