Merge "Update compat flag to use VERSION_CODES.VANILLA_ICE_CREAM instead of 35" into main