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

Change-Id: I795538f4f0d222d5521d798349474f94b108fafa