Merge "Change handling logic in SystemAudioAutoInitiationAction" am: e31990f54c
am: add89ebe40

Change-Id: If37e08f891639e6bb8c568bea4ca90dc6470d6bc