Merge "Convert extensionTime to millis" into tm-dev am: 3f480fee am: 7649163c

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



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