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

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

Change-Id: Ie4414a7311b49df8b4de241e7a96206ca8131044