Merge ""turn off APM to make a call" message pop-up even when APM off" am: a3a213ac5c am: e5191a7202

Change-Id: I07c6a02ad7fbf8b88fee0a18fee4cd67084e7468