Merge "aapt2: fix dangling reference to diag" into main am: 681514f3 am: ca9e9102

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



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