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