Merge "audiopolicy: add null pointer check for primary hw" am: 3e9dd76e81
am: a39f7f0e48

Change-Id: Ie4272aae9b684e36c167f862ed9eb8f1b4e27ceb