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



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