[automerger skipped] Merge "Time service / strategy config refactoring" into...

[automerger skipped] Merge "Time service / strategy config refactoring" into udc-qpr-dev am: 0f9db7e4 am: 0266a4dc -s ours

am skip reason: Merged-In I4f95ca03178baa5a5fe647f6fef40a6f1394a6cf with SHA-1 d748d91a is already in history

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



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