Merge commit 'b21b57c0' into manualmerge

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

Change-Id: Ic998e70207851e7e00f56d6e8591e53834987358
tree: 92532192043eae7f99ed162ab6b5173c48786b09
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk