Merge "aapt2: fix dangling reference to diag" into main