Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev