Merge "Append 'Seconds' to timeOfClock and timeOfEphemeris" into tm-dev am: 34435473c8 am: 6e7ebee6ba

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

Change-Id: I0ae9ce47457829ddf85044f8af17f6c9bf737d55