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

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

Change-Id: I2b719aa845044fa41f6eb9e4c7e4dfcd76928313