Merge "Skip android11-tests-dev." am: bb12496933 am: d7bb64fffd am: 3666c431c8 am: 9d3a79fd38 am: efc2db020a

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

Change-Id: Ib484890acd9498ac221b610ae999c82d95c8a91d