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