Merge "Specify product_specific to true in frameworks-base-overlays" into main