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