[automerger skipped] Merge "resolve merge conflicts of...

[automerger skipped] Merge "resolve merge conflicts of 802cc7de to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: f96a0fa6 -s ours

am skip reason: Merged-In Ib69577745c26595ed3964a4341086138dd5d34b0 with SHA-1 074ba590 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16198986

Change-Id: Ieb38dd1ba66e02c9065e260144daa8e31a5f8f3b