DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 207e8694bf

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