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