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

am skip reason: subject contains skip directive

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