Merge "Add the ability to override time origin priorities" into sc-dev

core/java/android/app/timedetector/TimeDetector.java

...java/com/android/server/timedetector/EnvironmentImpl.java

...ore/java/com/android/server/timedetector/ServerFlags.java

...om/android/server/timedetector/ServiceConfigAccessor.java

.../com/android/server/timedetector/TimeDetectorService.java

...android/server/timedetector/TimeDetectorShellCommand.java

...com/android/server/timedetector/TimeDetectorStrategy.java

...roid/server/timezonedetector/TimeZoneDetectorService.java