Merge cherrypicks of ['googleplex-android-review.googlesource.com/24271775', 'googleplex-android-review.googlesource.com/24271776'] into udc-release. am: b8e07c25c4

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24506005

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