[automerger skipped] Merge "Remove unused ICU4C dependency in audio policy" am: 62ba8ce78c am: 7b7d889ec4
am: 4c2255fb92 -s ours
am skip reason: change_id I8ba3db496f11630eebabb7184c532d59237279b0 with SHA1 ce727fe64f is in history

Change-Id: I94127bf1e185819999be15dc0c48988632f3a1f9