Merge "[automerger skipped] Merge "Setting callbacktype type to invalid value before invoking HIDL call" into pie-vts-dev am: 5e9cf46491 am: d7059a8549 -s ours am: b4e4ddc88e -s ours am: 6011d7d104 -s ours
am: a394a40999 -s ours
am skip reason: change_id I9211c3e172727f56d0cceaf91b98f8d5b3c7fc7e with SHA1 18408a93d9 is in history

Change-Id: I2307bdb8fa06089b27497fb8f697f2748d493775