[automerger skipped] Merge "Remove AE requirement for entensions-enabled small screen devices" into stage-aosp-udc-ts-dev am: 66f14236aa am: 8ce43e4ee6 am: 98e09e5bb7 -s ours am: 6c482ebe89 -s ours

am skip reason: Merged-In I4ba16907aa47a2cdc1c1e7d7cc04f6382a2508e2 with SHA-1 bfdbd404a7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24920266

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