[automerger skipped] Merge "FaceEnrollIntro requires scroll for accessibility"...

[automerger skipped] Merge "FaceEnrollIntro requires scroll for accessibility" into 24D1-dev am: 43d0dfdc -s ours

am skip reason: Merged-In Ia9f24ee658df96647fe953e84119d20270200011 with SHA-1 4b66abd9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27903892



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