Merge "[aapt2] Always generate code for permissions" into main am: a148b9fa am: bbd2c460

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



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