Merge changes from topic "base-state-api" into tm-qpr-dev

* changes:
  Introduces requestBaseStateOverride test API
  Adds requestBaseStateOverride method on DeviceStateManagerService
  Introduce OverrideRequest type property