Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21522444



Change-Id: I132de43f5d1b0646765e4e755e7f31d6ec049567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>