[automerger skipped] Merge changes from topic "perband-onet" into...

[automerger skipped] Merge changes from topic "perband-onet" into sc-v2-dev-plus-aosp am: cc99b1d1 -s ours

am skip reason: Merged-In I4c6ab1febcf12c6a7e2ab3364bb720e81c58dae7 with SHA-1 84b8cd11 is already in history

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

Change-Id: I223b3d94688caf50e1b24b17998fd7773fc9ea96