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