[automerger skipped] Merge UP1A.231005.007 am: d4593eca5b -s ours am: 543dda5233 -s ours am: b807ea316a -s ours am: 75d2b2d0a0 -s ours

am skip reason: Merged-In I02e3046bd85d0dfebc68ab444f1796bb54cc69c7 with SHA-1 1e81ee1363 is already in history

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

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