am b037a870: (-s ours) am b9de4496: am 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b037a8706d394afd803af6a20fe7cae0d9248e30':
fix PDK no-java build

- As this component is in PDK, it should not be built when necessary
  frameworks libraries are not available.
- For full platform source tree, the ...JAVA_SUPPORT_LEVEL is platform.

Change-Id: I6d37970ab7a3e5183d3a04b003ec3f81f907abc8
am a0f3a809: fix PDK no-java build

* commit 'a0f3a809d88e871ca5298b3c7aea2f4b5fc43839':
  fix PDK no-java build
Merge "get group identifier level1 (Gid1)"
am c13624a4: Merge "get group identifier level1 (Gid1)"

* commit 'c13624a4a0b63c492fa8b336ae737f831bde50eb':
  get group identifier level1 (Gid1)
Merge commit 'b21b57c0' into manualmerge

Conflicts:
	src/java/com/android/internal/telephony/uicc/SIMRecords.java

Change-Id: Ic998e70207851e7e00f56d6e8591e53834987358
am 620c8855: Merge commit \'b21b57c0\' into manualmerge

* commit '620c8855bcaa3fe8d492e93811b0ed6e8b4f59fc':
  get group identifier level1 (Gid1)
add columns of Carrier about MVNO

To recognize MVNO, use new fields, MVNO_MATCH_DATA and MVNO_TYPE
(SPN, IMSI, GID(Group Identifier Level 1)).

Bug: 8143480
Change-Id: Idfa06c6f39a2c15ff4f0815724823f44b76ac819
Merge "add columns of Carrier about MVNO"
add MVNO check routine

modify createApnList() API as the followings:

1.1 mvno != null (already matched mvno info)
1.2 mvno == cur_mvno_info
1.2.1 result.add
2.1 mvno == null (not yet)
2.2 mvnoMatch check
2.2.1 clear prev results.
2.2.2 result add (mvno)
2.3 mvno_type is null
2.3.1 result add (normal)

match mvno as the followings:
1. if mvno_type is spn, compare spn of SIM
2. if mvno_type is imsi, compare imsi of SIM
3. if mvno_type is gid, compare gid of SIM

Bug: 8143480
Change-Id: Idf0aa1ddf139f80c7d33b1e3315493d32dbf433a
Merge "add MVNO check routine"
am ae6a4485: Merge "add columns of Carrier about MVNO"

* commit 'ae6a44857a0b3d9e37c53f2cfd42e13003c68408':
  add columns of Carrier about MVNO
am 63152045: Merge "add MVNO check routine"

* commit '631520453bea1841dbc808a051bd09eb85599b4b':
  add MVNO check routine
am fbd959c2: am ae6a4485: Merge "add columns of Carrier about MVNO"

* commit 'fbd959c2f0e9e420d1b65f14463ba8da04e76655':
  add columns of Carrier about MVNO
am f7bf2056: am 63152045: Merge "add MVNO check routine"

* commit 'f7bf205684ca101326e57921d81963da7541e3c6':
  add MVNO check routine
am c60e2c6e: am fbd959c2: am ae6a4485: Merge "add columns of Carrier about MVNO"

* commit 'c60e2c6e5a3b09b2eaf6298863e5c3b0e7caefa0':
  add columns of Carrier about MVNO
am 2c74d79c: am f7bf2056: am 63152045: Merge "add MVNO check routine"

* commit '2c74d79cab4eee87acf0e74c0d8bf76be8f0f4aa':
  add MVNO check routine
RIL: Correct the RIL_REQUEST_DIAL api missmatch

The uusPresent is written twice in dial() so it will always be
marked as absent.

Change-Id: Id50a4dc8a3eefdaf2284e410382428c52e9b5ef1
Merge "RIL: Correct the RIL_REQUEST_DIAL api missmatch"
am 0f7c9029: Merge "RIL: Correct the RIL_REQUEST_DIAL api missmatch"

* commit '0f7c9029877f3643824a2c3cb567f6b96f189eb5':
  RIL: Correct the RIL_REQUEST_DIAL api missmatch