Merge cherrypicks of [13636770, 13638692, 13636771, 13637567] into rvc-qpr2-release am: 1d8245b1c3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8efefba8c6d07ab9142e63c75ca9ea677e525853