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