[automerger skipped] Merge "Add --no-compile-sdk-metadata switch to AAPT2"...

[automerger skipped] Merge "Add --no-compile-sdk-metadata switch to AAPT2" into udc-dev am: 0e27ed29 am: 3b597c15 -s ours

am skip reason: Merged-In I552e50802a328c2318c9f261e30beadcbca5fd29 with SHA-1 07287be1 is already in history

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



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