[automerger skipped] Add checks of output shapes when...

[automerger skipped] Add checks of output shapes when OUTPUT_INSUFFICIENT_SIZE. am: 91521ab8 am: 87437306 -s ours am: f2361e92 -s ours am: ebacc94d -s ours am: a2c09b1a -s ours

am skip reason: Change-Id I934d084c7665160a98da9828604ce8297fef73b8 with SHA-1 d454751e is in history

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

Change-Id: I6da9f10a2ad7be53eec01c71ea0b46bc5b687892