Merge "Change handling logic in SystemAudioAutoInitiationAction"
am: e31990f54c

Change-Id: Ifbc111a3b01448f7eb35c4dc6b7ebb3be3331bfa