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

Change-Id: I131d684785c9ca564606dddc8164f28acc39e779