[automerger skipped] Merge "Remove unused `tags` property from Android.bp files" am: 9415ec2a4f am: 1ab6ca9f42  -s ours
am: 745451f6ac  -s ours

Change-Id: I1c4b6d81536386581f2e1756ad49cdbbfe4bbf55