Merge "Make auto time source suggestions prioritisation configurable." am:...

Merge "Make auto time source suggestions prioritisation configurable." am: f8641165 am: 3089e5eb

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

Change-Id: I15c4daa785afe5f7f968d716220f87245e2c623a