[automerger skipped] Merge "Switch "UTC time" to "Unix epoch time"" am: 1ecf1d2462 am: b78dfa9ee9 am: 02eebf4399 -s ours am: 14a9a37227 -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: I79d176fe2f4752e5edb512048d6811e12c5711e1
This commit is contained in: