Merge "Merge "Filter instant apps with different names" into oc-dev am: adcc94f160 am: a350db60bd" into oc-dr1-dev-plus-aosp