Merge "Ensure we do not set seInfoTargetSdkVersion to 0." into pi-dev
am: 52ae06af4d

Change-Id: Ifa75e67c23797b2578cc1e5dfea989a1df953667