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