Merge changes from topics "cherrypick-lock-task-1l1m9ziktkw",...

Merge changes from topics "cherrypick-lock-task-1l1m9ziktkw", "cherrypicker-L23700030000857114:N48700030014533099" into udc-qpr-dev am: 8f40d44c

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



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