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

Change-Id: I45ad57a48356a061ed52fa7c9a46af2d24157e50