Merge "Prevent 3rd party app from turning on speaker during the system call Test: manual"
am: cec740470c

Change-Id: I1b4db443f1e112a25d69a03e0b81af1595db5686