Merge changes from topics...

Merge changes from topics "cherrypicker-L18900030008374535:N55600030140665819", "cherrypicker-L78800030008299249:N92100030138810027" into main am: 28d627c7

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



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