Merge "Merge changes from topic "am-6bcbb13e26064967bf0fd86a37a92da1" into...

Merge "Merge changes from topic "am-6bcbb13e26064967bf0fd86a37a92da1" into rvc-d1-dev-plus-aosp am: 15c29ff1" into rvc-qpr-dev-plus-aosp am: 07c92e32

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

Change-Id: Ibfcf15fc51f9eec2e7eec18751454c6c23f887f3