Merge changes from topics...

Merge changes from topics "cherrypicker-L13300000963667898:N27000001416235071", "cherrypicker-L85800000963667755:N59500001416232655" into main am: e9c999d7

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



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