Merge "Fix product_services apps getting PRODUCT scanFlags."