Merge "Merge "Revert "Enable Sharesheet ranking using PeopleService by default to test in Droidfood"" into rvc-dev am: d48a06e6 am: 63c2169f am: c0bebd85" into rvc-qpr-dev-plus-aosp am: 62a35c24

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

Change-Id: Ia20e0431cbc235b4c66dab3b83b004ee244e5aa4