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

Change-Id: I65562306c089dfedc3d06ae147f4f619fdd69ab5