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