[automerger skipped] Merge "Prepare to make time detection more configurable"...

[automerger skipped] Merge "Prepare to make time detection more configurable" am: ebec38b9 am: 0f61a4ac am: abab23f3 -s ours

am skip reason: Change-Id Id1652be174b7503618e0b802dc7da4d00df4f248 with SHA-1 e96de768 is in history

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

Change-Id: I0392049a1dd414959ff449d6ea00e21cbea51980