Merge changes from topics...

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

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



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