[automerger skipped] Merge "audiopolicy: add null pointer check for primary hw" am: 3e9dd76e81 am: a39f7f0e48 am: 80192a580f
am: c499a08925 -s ours
am skip reason: change_id Ief07a36ca8aed0e6013d533bd0aa66e122e3070c with SHA1 fedb5986df is in history

Change-Id: I077cfc9850980be21786eac9b88682866283e046