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