Merge "Filter instant apps with different names" into oc-dev am: adcc94f160
am: ae524ac5fa

Change-Id: I4d858aec3c61899f150e1a48571d142075549654