Merge "Update time.h for android-12." am: 63cb77947e
am: d3e2301650

Change-Id: I710922ec70e39ae8afe117b74d73b1652f452985