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