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