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