[automerger skipped] Add missing validation for NN canonical types am: 388bcebc8f am: 2f59ea0610 am: 0f10ee9eb3 am: 564f406016 -s ours

am skip reason: skip tag Change-Id Ic05c177f61a906a69bf82ff9c4d5bb8b0556d5ca with SHA-1 08ee3f9287 is already in history

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

Change-Id: I550c6d07503e3df92645c1bd97c24c8e423b71e1