Merge "Add SystemApi in SystemProperties for vendor apks"