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

Change-Id: Ib49a3877efa9dad16da6fc31d7ff295815c6f879