[conflict] Merge "[Autofill PCC] : Maintain suggestion ordering" into...

[conflict] Merge "[Autofill PCC] : Maintain suggestion ordering" into udc-qpr-dev am: 6842f3d6 am: 9d1ced8a

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



Change-Id: I9e5946b4e22e6fef50e26adbc75a2ef3098ca1e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>