Merge "Do not allow the FalsingManager sesion to start when AOD is showing." into qt-dev
am: 000415be6e

Change-Id: I6a34fb8a15e1117c0620785a9562ffb3ad6fa76d