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

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

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

Change-Id: Icbb7e1f643d4a28823580a5fc7c4f993384fdadb