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

Change-Id: Id9ecd08af0cce81cf1be361d041c3ae375476e81