Merge "Honor audio focus in kitchen system test cases" am: 7e060bcf0c
am: 9755c3404c

Change-Id: I20509d9e8c8037a6b9538ed169c702dc421c2792