Merge "aapt2: avoid vector<const T>" into main am: b54b9b5251 am: 31bbf07576

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3151337

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