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