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