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



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