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