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