[automerger skipped] Merge "Adding test-mapping group for large screen...

[automerger skipped] Merge "Adding test-mapping group for large screen specific tests" into sc-v2-dev am: dd0f9d05 am: 37379b37 -s ours

am skip reason: Merged-In Iad98e54521ad0ee782b5e28a3cb8c885192a6ec5 with SHA-1 dd52fd82 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15795678

Change-Id: I232f2bf594f41310a0254e53ff9021540bcd9433