Merge cherrypicks of [20026125, 20112204] into tm-qpr1-release. am: 88a4c62d2c

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

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