[automerger skipped] Merge "Switch "UTC time" to "Unix epoch time"" am: 1ecf1d2462 am: b78dfa9ee9 am: 02eebf4399 -s ours
am skip reason: Merged-In Ic477c021529a94b4a3665426b7daaf6567fa311a with SHA-1 115132dbaa is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1979487
Change-Id: I9b48b3137bcd1117b9acf483edb4591e72b6d2e9
This commit is contained in: