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

Change-Id: Iadd24fe189f36c65abc757d0e98a7c785df4dedd