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