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