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