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