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