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