Merge changes Ica472482,I32381136 into main

* changes:
  locksettings: clean up references to managed profiles
  Sync tieProfileLockIfNecessary() with internal main