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

Change-Id: I31757d24ac9ec3faf1f180706bde40d36c3a9da2