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

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

Change-Id: Id7a2098fa45e5d67bc22ea4cfbfed312433c3478