[automerger skipped] Merge "Set min_sdk_version/apex_available for androidx" am: 970f32052b am: 4d8e379d96 -s ours

am skip reason: Change-Id I16669c0e46d7e487c29dd6c9f29f75361f1b5ebb with SHA-1 ef03bff4d0 is in history

Change-Id: I6339b1360e5f1deb63f130bc2c63270f2acb2b62