Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17821505 Change-Id: Ic226704aa46e981f3970793541a247df9d4dcf83 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>