tree 1c560728b6f4384b9a1885eccc5920695503221f
parent dbc716b59492b4fcf59bf2e8c159afd5cc45c47d
parent 53dcf9171224f9b63669cd94259ffbd7499742be
author Dave Mankoff <mankoff@google.com> 1564194622 -0700
committer android-build-merger <android-build-merger@google.com> 1564194622 -0700

[automerger skipped] Merge "Do not allow the FalsingManager sesion to start when AOD is showing." into qt-r1-dev am: 88db86963d am: 9ffc163495
am: 53dcf91712 -s ours
am skip reason: change_id I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c with SHA1 1a6d9e6ae2 is in history

Change-Id: Id110033c3370c921687f6883a76303e44d87ad0c