am 85ca69dc: Merge "Add CTS tests for the new UsageStats API" into lmp-dev

* commit '85ca69dc674e2fd00bd083f529ba47a87ee4970b':
  Add CTS tests for the new UsageStats API