Merge "Enable ChooserTarget ranking of the same app." into rvc-dev am: efa0eab058

Change-Id: I82b61ef8539f9dbb842d3205c78a6d8ea77d0459