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

Change-Id: I68dca45ba5e0ca42dc45ec252232eac9bf67e302