Merge changes from topic "am-9b966c8d70f44c9981900ad3e70dcafe" into main

* changes:
  [automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e -s ours am: 196f43d4 -s ours am: 922923b5 -s ours am: 74e52410 -s ours am: b624cb94 -s ours
  [automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a0 -s ours am: 6b8ac9a3 -s ours am: 13efbf2e -s ours am: e3c05c11 -s ours am: 5d31fb97 -s ours