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