Merge tag 'LA.UM.9.12.r1-13800.02-SMxx50.QSSI12.0' into int/12/fp4

"LA.UM.9.12.r1-13800.02-SMxx50.QSSI12.0"

* tag 'LA.UM.9.12.r1-13800.02-SMxx50.QSSI12.0':
  Fix an issue in SystemStatusNetworkInfo DataItem
  Increasing boot_time and real_time acceptable variation
  Use QMI WDS API to query pdn for SUPL ATL
  Apgs subscriber mananger fix
  Resolve one race condition issue in GnssAdapter
  Fixes ubsan shift-out-of-bounds SIGABRT
  Correct equals() for SystemStatusNetworkInfo
  Clear Emergency SUPL APN Name of SOS
  Block antennainfoCallback when vector size is 0
  add policy files to package list
  Comment out ANTENNA_INFO_VECTOR_SIZE by default
  BatchingAdapter to handle engine up after init
  GTP: add xtwifi policies for GTP WWAN call flow
  add libminiajil polices for xtwifi-client and inet-agent
  fix ntrip parameters invalid issue
  Batching API batch retrieval changes

Change-Id: I8885694cd261bb185f9e01886ab325ad0a62ed7f
diff --git a/etc/gps.conf b/etc/gps.conf
index 75f12f2..ee25231 100644
--- a/etc/gps.conf
+++ b/etc/gps.conf
@@ -17,8 +17,8 @@
 # Intermediate position report, 1=enable, 0=disable
 INTERMEDIATE_POS=0
 
-# supl version 1.0
-SUPL_VER=0x10000
+# supl version 2.0
+SUPL_VER=0x20000
 
 # Emergency SUPL, 1=enable, 0=disable
 #SUPL_ES=1
@@ -146,7 +146,7 @@
 # 0x1: RRC CPlane
 # 0x2: RRLP UPlane
 # 0x4: LLP Uplane
-A_GLONASS_POS_PROTOCOL_SELECT = 0
+A_GLONASS_POS_PROTOCOL_SELECT = 0xF
 
 ##################################################
 # Select technology for LPPe Control Plane