Merge changes I51628abe,I412d62b7 into rvc-dev am: 82e0c384f3

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

Change-Id: Icfc2c61bfc0367e74328a13aefccf54b04c199f2