Merge "audio policy manager: do not reapply same forced usage" into oc-dev
am: 6aa929c929

Change-Id: I24d35bbf3c08960aefad9f18c243871ba508b7fe