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