Merge "Ensure that FalsingManager is not active when phone unlocked." into...
Merge "Ensure that FalsingManager is not active when phone unlocked." into rvc-dev am: 6b0bccc9 am: 46a5c85c am: c9f39571
Change-Id: Ib747c108d9297268dd634d970429399bff944cc4