Merge "Move the lock_icon_view to the KeyguardRootView" into main