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

Change-Id: Id41e9b03047118bfc121cab0b9993ad8906a78a7