Merge "Remove libandroidicu dependency from FwdLockEngine"