[automerger skipped] Merge "Switch "UTC time" to "Unix epoch time"" am:...

[automerger skipped] Merge "Switch "UTC time" to "Unix epoch time"" am: 1ecf1d24 am: b78dfa9e am: 02eebf43 -s ours am: 14a9a372 -s ours am: 99c8bbc5 -s ours

am skip reason: Merged-In Ic477c021529a94b4a3665426b7daaf6567fa311a with SHA-1 115132db is already in history

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

Change-Id: If779f3585474fb4159d8d3f315347e0b3927b02a