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