[automerger skipped] Merge "Make auto time source suggestions prioritisation...

[automerger skipped] Merge "Make auto time source suggestions prioritisation configurable." am: f8641165 am: 3089e5eb am: d0b6a054 -s ours

am skip reason: Change-Id I2a67414d4f2b9d972507052c7c2c817d59be59ba with SHA-1 f037ccf6 is in history

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

Change-Id: I8520ee06b027354dddf64b4c237b1556c02b7792