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

[automerger skipped] Merge "Add --no-compile-sdk-metadata switch to AAPT2" am: e95f26d2 am: 1da0bb6e am: 783a53e7 -s ours am: 0fcd55ca -s ours

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

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



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