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



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