[automerger skipped] Merge changes from topic "cherrypicker-L52100000961978432:N33500001387892765" into udc-dev-plus-aosp am: 284dc1d3 -s ours

am skip reason: Merged-In I728186d9bc90c98fabd76d3f86569840488ada96 with SHA-1 329fef34 is already in history

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



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