[automerger skipped] Merge Android U (ab/10368041) am: 7783feb1cb -s ours am: 9a7fe98999 -s ours am: 1f21d66960 -s ours

am skip reason: Merged-In Ia228cf5fc69baf995c37796679da74cadc646ce1 with SHA-1 2fa4dc5654 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/DebuggingRestrictionController/+/24182612

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