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

Change-Id: Ib2de3017b010f0c28409501a7829359d1ce73f96