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