Merge "API level 30 cleanup." into rvc-dev-plus-aosp am: 8526cb7288 am: dd579011b1 am: 186356624d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11709399

Change-Id: I724c94c38a489da741ed35a72fc77948d723ac84