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