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