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