Merge "Enable android:restoreAnyVersion" into main