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