Merge "Add test for Vpn#prepare()" into sc-v2-dev-plus-aosp