[automerger skipped] Merge "Setting callbacktype type to invalid value before...

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

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

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

Change-Id: I8a33aa8487c1e23f482df7291e08c694d68e879d