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