tree 1e4bc6f2aed67665eacce085c3b8fa061f5c06a5
parent 9c6d1420770b7c1e39d57f7b021e6d4f1649f888
parent f397fa74389f886fe72ca0617fddd09d311b9888
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1670294664 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670294664 +0000

Merge cherrypicks of [16740114, 16740115, 16740116, 15829070, 18029505] into sc-platform-release. am: f397fa7438

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

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