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

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



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