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