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