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

Change-Id: Ia7987c15d6d37812413c004ef2e0462f0616b2ab