Merge "Adding test-mapping group for large screen specific tests" into sc-v2-dev am: dd0f9d05

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

Change-Id: I21df30874e725830698b08dd80316e1148c17c8e