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

Change-Id: Iece96b00fecade8aa5a9b0a2334fb45fec8f57e1