[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: 5e9cf464 am: d7059a85 -s ours am: b4e4ddc8 -s ours am: b857ef8c -s ours
am: 88852de9 -s ours
am skip reason: change_id I9211c3e172727f56d0cceaf91b98f8d5b3c7fc7e with SHA1 18408a93 is in history

Change-Id: If3a784dec6e9f3775d63c4a500496ed5d850e7f2