[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: beed480907 -s ours am: 4deb3d2e2c am: 23476755e3 am: 78ac9ef952 -s ours

am skip reason: subject contains skip directive

Change-Id: I6e4e2d0a9b4a846dc009ba008a156b65fd015e20
tree: dede9e243db6efe92978faf8fd6e953e0298fbe6
  1. test/
  2. Android.bp
  3. time_in_state.c