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