Merge "Build.VERSION_CODES_FULL: backfill older Android versions" into main