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

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

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