Merge "Lose convertToResPath to aapt." into main am: 92ad0d32 am: 5ba37981...

Merge "Lose convertToResPath to aapt." into main am: 92ad0d32 am: 5ba37981 am: f0ee03c4 am: 7d71f24b am: 1615dca9

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



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