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