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: 91e3c288 am: d4fe3af3
Change-Id: I865e11a1b30bda081997a2733f9d1bfe04c94614