Merge "Merge "Ensure that FalsingManager is not active when phone unlocked."...
Merge "Merge "Ensure that FalsingManager is not active when phone unlocked." into rvc-dev am: 6b0bccc9 am: 91e3c288" into rvc-d1-dev-plus-aosp am: 5f5bff86
Change-Id: Idd875044d33bc8f627a232f6534fa782bfd3561f