Merge "Adding UNPROCESSED to the available audio_sources and SUPPORT_AUDIO_SOURCE_UNP...

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc core/res/res/values/config.xml
Simple merge

diff --cc core/res/res/values/symbols.xml
index 3641061,39aad17..dc288d5
--- 1/core/res/res/values/symbols.xml
--- 2/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@@ -300,12 -300,11 +300,13 @@@
    <java-symbol type="bool" name="config_wifi_enable_5GHz_preference" />
    <java-symbol type="bool" name="config_wifi_revert_country_code_on_cellular_loss" />
    <java-symbol type="bool" name="config_wifi_enable_wifi_firmware_debugging" />
 +  <java-symbol type="bool" name="config_wifi_turn_off_during_emergency_call" />
    <java-symbol type="bool" name="config_supportMicNearUltrasound" />
    <java-symbol type="bool" name="config_supportSpeakerNearUltrasound" />
+   <java-symbol type="bool" name="config_supportAudioSourceUnprocessed" />
    <java-symbol type="bool" name="config_freeformWindowManagement" />
    <java-symbol type="string" name="config_defaultPictureInPictureBounds" />
 +  <java-symbol type="string" name="config_centeredPictureInPictureBounds" />
    <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_threshold" />
    <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_factor" />
    <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_penalty_threshold" />

diff --cc media/java/android/media/AudioAttributes.java
Simple merge

diff --cc media/java/android/media/AudioManager.java
Simple merge