resolve merge conflicts of c449ba34 to...

resolve merge conflicts of c449ba34 to udc-qpr-dev-plus-aosp am: 8b30afbd

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



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