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