Merge "Prepare to make time detection more configurable" am: ebec38b952

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

Change-Id: Ibd6a844c1c69b55a5ddcb31b8427349b6ed731ca