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