Merge "AudioFocusRequest: getOnAudioFocusChangeListener in test API" into pi-dev am: 301a925597
am: 4a09bab517

Change-Id: Ia3346aa5ec6a4b263120e8a650cf93d32fd19b06