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

Change-Id: I92b974e54bbb51d47339c67513c8654e84dfd35f