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