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