[automerger skipped] Merge "Add a Y2038 check into the time_detector" am: 808b9f1b73 am: 1aa92e3754 -s ours am: 3361c7cd07 -s ours
am skip reason: Merged-In Ib9d6472f5ca7a62d59b3224f1845846f99a0b52d with SHA-1 b1f132b5e6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1994850
Change-Id: Ie4b45e870032fe28c00085533094c491288cd394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: