Merge changes from topics...

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

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



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