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