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