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