Merge "Add null check in enterBackgroundAudioProcessing" am: 7a6eec5391
am: 7c8c02da20

Change-Id: I0785f8d6505da5cc8bbcd312b7bd2c849472dacd