[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-816e990566ca4b6babdd5295b4a673bf" into sc-v2-dev-plus-aosp am: 3f60d5c1 -s ours

am skip reason: Merged-In I9dbfce9fe76e80d9c6a842a4ebcfbedf09fbdc42 with SHA-1 830179fb is already in history

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

Change-Id: I733ee6483a764444de3b1e1f01d50c3379e91237