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

Change-Id: I4f8fe31455f5946477d8a793843e70d0f88d17eb