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