Merge changes from topics "presubmit-am-0adc4a89a1534fb8873a721309ac084a",...

Merge changes from topics "presubmit-am-0adc4a89a1534fb8873a721309ac084a", "presubmit-am-f0e20c2f5d9d42f5b21d0cb6ae2e15cd" into tm-dev am: b3729dc0

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



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