[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L53600000958769418:N05800001340074698" into sc-v2-dev am: 14f6ffd2 -s ours am: 58fa52b5 -s ours am: 05296b9e -s ours

am skip reason: Merged-In I52185f74ae8d28b379440235ca6f03c5089081f5 with SHA-1 972675ed is already in history

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



Change-Id: Ifecbb11a418d25efe600eba399c24a9bdfeef84f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>