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

Change-Id: I7a9cbec35cc24fb56d4bf0e1819b94d69bbafa5a