[automerger skipped] Merge "Use TagType constants" into sc-dev am: acce5d3c...

[automerger skipped] Merge "Use TagType constants" into sc-dev am: acce5d3c am: 0a8f7aeb -s ours

am skip reason: Merged-In Ie8af1f00d04fa05c59cfc72692caecbcf2fae483 with SHA-1 a5047720 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15232853

Change-Id: I6d8cbf67055783905fa0302e6913c4bbe1c9a57c