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