Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5
am: 01be9a9316
am: df795b881e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550 Change-Id: I30e15464036a4bd9183efd8709954d6434ceaf24
This commit is contained in: