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