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