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

Change-Id: I765ef87bb3290949c7ab569031f3d6e300e60916