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



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