Merge "Re-apply "db845c: upgrade PRODUCT_SHIPPING_API_LEVEL to 34"" into main