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