tree 1c560728b6f4384b9a1885eccc5920695503221f
parent 56deb3e87e15e095818b89974818906809ea229b
parent 4ad9f0ee1e5a1b09f35d3162d2f9658daccc380c
author Dave Mankoff <mankoff@google.com> 1564194836 -0700
committer android-build-merger <android-build-merger@google.com> 1564194836 -0700

[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