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