[automerger skipped] Merge "Fix NPE at at UiccController.java:1028" am:...
[automerger skipped] Merge "Fix NPE at at UiccController.java:1028" am: 864375d6 am: 74d29eec -s ours am: ee759c52 -s ours
am skip reason: Change-Id Ia68eec392bdba027d256b881740d25104191e4a9 with SHA-1 2486187c is in history
Change-Id: I667a6e97a7c44c195d46841b030bf71c42acd31f