Merge changes I02e3046b,I5b33ca47 into main am: 50eaceedda am: f0e1d5105e am: 543846cb9a

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

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