resolve merge conflicts of ff0a789f to...

resolve merge conflicts of ff0a789f to rvc-dev-plus-aosp am: b0714585

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

Change-Id: Ie7646e563e3c0a87bf8c8888b88dbda2c3f65982