Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev