Merge "Time service / strategy config refactoring" into udc-qpr-dev am: 0f9db7e4

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



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