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