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