Merge changes I507f8573,I6d9efe2e into sc-v2-dev

* changes:
  [res] Finalize resources in SC-v2 RESTRICT AUTOMERGE
  [aapt2] Fix finalized resources removal