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