Merge "De-duplicate with callerTargets(added by using Intent.EXTRA_INITIAL_INTENTS) when adding DisplayResolveInfo." into rvc-dev am: e79c1056b2 am: 37334ce7d4

Change-Id: Ib70478206926b68fd3b6de0535b63f01b75638f1