Merge ""turn off APM to make a call" message pop-up even when APM off" into rvc-dev am: 6af1412f5e

Change-Id: I4bf894270e7fb25c14ebae0df04af0c6d56991cf