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