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

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

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