[automerger skipped] Merge "Use android.hardware.graphics.common-ndk and...

[automerger skipped] Merge "Use android.hardware.graphics.common-ndk and composer3-ndk wrappers." into tm-qpr-dev-plus-aosp am: 9f86720c -s ours

am skip reason: Merged-In I1418307159dbaa9d2acc44997f13a41d629d56c0 with SHA-1 3ea28f19 is already in history

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



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