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

Change-Id: I14bb0cb4b8c682798bc70c3fb5e3b3550f5b65cb