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

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