Merge "Split VendorFrameworkCompatibility test"
am: e88fd7c9ed

Change-Id: Ifdb7e0765e0be3f458cc233df1abc673816b00ec