[automerger skipped] "turn off APM to make a call" message pop-up even when APM off am: b74039a014 -s ours

am skip reason: Change-Id I3059d9b7647dc9a633683e3f8d8cf73fb5f202e3 with SHA-1 cdb6de4acc is in history

Change-Id: If1cddfa1da298eeaef8dd81b554b49e8b49e571a