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

Change-Id: Icfc42856f24012ec2e4f0fd4204a2f3f081467d0