[automerger skipped] Change 'blacklist' to 'disallow' am: 26f365b8 am:...

[automerger skipped] Change 'blacklist' to 'disallow' am: 26f365b8 am: 2d0bac77 am: 34683666 am: ad7c65a3 am: 49d4a3e0 -s ours

am skip reason: Change-Id I6d1bc4f1cd95a56287127918f4c8111cafd6e833 with SHA-1 1bdd58dc is in history

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

Change-Id: If74b5e2e3c3f05c245f95858555df607c2c966f7