Merge changes Id95234d6,I4328d9d7

* changes:
  audiopolicy: Specify the suite for presubmit tests
  audiopolicy: Improve patch count checks