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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11366999

Change-Id: Ieb30757721649483a5aae76bd057ddc4cb8e94b7