Merge "Skip android11-tests-dev." am: bb12496933

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

Change-Id: Id6bf038eec8655ac7daeb6338bd1ab80504b5969