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