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

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