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