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