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



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