Merge 673b5199984a868e0494e5877e15a8b74123e218 on remote branch

Change-Id: I4c2e70ab50565e874a76d642ec847b530d0a4c56
tree: af8636160b4f77fd9bc488913a3ddcd9b891fc0b
  1. test/
  2. Android.bp
  3. METADATA
  4. OWNERS
  5. time_in_state.c