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