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