[automerger skipped] Use new android versions support in robolectric, and new android specific SdkProvider in test/robolectric-extensions. am: 8842a02e26 am: db2a80e5e8 am: 3d87e3bb91 -s ours am: 529eb3e3aa -s ours am skip reason: Merged-In Ieeb4c6afefa8f459c5a872cdf7b0b99f4f806ad6 with SHA-1 8842a02e26 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/test/robolectric-extensions/+/23675214 Change-Id: Id47c27b4047856d9b3eccc040cb55260252ee622 Signed-off-by: Automerger Merge Worker <[email protected]>