[automerger skipped] Merge "Setting callbacktype type to invalid value before invoking HIDL call" into pie-vts-dev am: 317d4048fb -s ours am: 276e0c856b -s ours

am skip reason: Change-Id I9211c3e172727f56d0cceaf91b98f8d5b3c7fc7e with SHA-1 18408a93d9 is in history

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

Change-Id: Iad81bcdea4773b29b941697ab2f5afc9e37a2cd0