Merge "Introduce aconfig flag to guard support for minor SDK versions in minSdkVersion" into main