Merge "Drop prefer: true from com.android.apex.cts.shim.v1_prebuilt" into main