[automerger skipped] Merge "Check HIDL Discriminator for CSG Info" am: 3a87f98eb6 am: a84db5e5f7 -s ours am: 68c5a26ad4 -s ours
am skip reason: Change-Id I08dc0d2050a9f4d4b574178e1c68a23d015768e4 with SHA-1 f85a2e9220 is in history
Change-Id: I662818d7447a90ba176c99513224522c481e1bbd
This commit is contained in: