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