[automerger skipped] FaceEnrollIntro requires scroll for accessibility am: 5434bb2a -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: I4623dc166f1e4dd7d705a6a4d2c0cb8f74fe5ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>