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