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

Change-Id: Id536c8dcb74461b46001f60a394d0a6888ed75cc