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