[automerger skipped] Merge "Do not allow the FalsingManager sesion to start...
[automerger skipped] Merge "Do not allow the FalsingManager sesion to start when AOD is showing." into qt-dev am: 000415be
am: cc87595e -s ours
am skip reason: change_id I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c with SHA1 622eeaf0 is in history
Change-Id: I349447d1e01deb9127a592f792f14b7633792919