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