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



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