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