Merge 96b0cae8c72458cf69f20f939bea72afd60cc48c on remote branch

Change-Id: If74b3c1b4e6dba3be598c921417375a579fe034d
tree: a476e393ee0525156a2d57f5f76f76db850d1db1
  1. test/
  2. Android.bp
  3. fuse_media.c
  4. LICENSE
  5. METADATA
  6. OWNERS
  7. PREUPLOAD.cfg
  8. TEST_MAPPING
  9. time_in_state.c
  10. time_in_state_test.cpp