[automerger skipped] Merge "Merge "Do not allow the FalsingManager sesion to start when AOD is showing." into qt-r1-dev am: 88db86963d am: ef1119cd5d" into qt-qpr1-dev-plus-aosp
am: 4ad9f0ee1e -s ours
am skip reason: change_id I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c with SHA1 622eeaf0d5 is in history

Change-Id: I20ec0f58224874802958abbb4b198ca81e3eca66