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