Merge branch 'feat/bootloader_nvs_read_encrypted_v5.4' into 'release/v5.4'

fix(esptool_py): NVS partition being incorrectly marked as encrypted by the build system (v5.4)

See merge request espressif/esp-idf!36679

Author: mahavirj

components/esptool_py/project_include.cmake

@@ -289,13 +289,13 @@ function(esptool_py_partition_needs_encryption retencrypted partition_name)
         #   - DATA 0x01
         # Subtypes:
         #   - ota      0x00
-        #   - nvs      0x02
-        # If the partition is an app, an OTA or an NVS partition, then it should
+        #   - nvs_keys 0x04
+        # If the partition is an app, an OTA or an NVS keys partition, then it should
         # be encrypted
         if(
                 (${type} EQUAL 0) OR
                 (${type} EQUAL 1 AND ${subtype} EQUAL 0) OR
-                (${type} EQUAL 1 AND ${subtype} EQUAL 2)
+                (${type} EQUAL 1 AND ${subtype} EQUAL 4)
           )
             set(encrypted TRUE)
         endif()