Merge changes Ia86e9311,I8a41aa42 into stage-aosp-sc-ts-dev

* changes:
  Add CTS covering component usage content providers
  Add CTS covering component usage broadcast receivers