Merge "Relax restrictions on supported API levels" into android15-tests-dev