Merge "Lose convertToResPath to aapt." into main am: 92ad0d32c0

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1764798

Change-Id: I8d3aa01961aae5760f5c476014deeaea516e6bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>