Merge "Merge "Update VHAL emulator" into qt-dev am: 993203db5d am: 1b072db26f" into qt-r1-dev-plus-aosp