[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 207e8694bf -s ours am: 6e61dfbd58 am: 5c3120e5aa

Change-Id: Iade83f703d40f05618df73588aa61e1cfab65850
tree: 2da7610edef803d71f05bc3d0301516885a40120
  1. test/
  2. Android.bp
  3. time_in_state.c