[automerger skipped] Merge "Do not allow the FalsingManager sesion to start when AOD is showing." into qt-dev am: 000415be6e am: cc87595ed5 -s ours
am:ece6c47e7a-s ours am skip reason: change_id I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c with SHA1622eeaf0d5is in history Change-Id: Ic02a9243e086644cbb31c512a781c082dc9a133f
This commit is contained in: