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



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