[automerger skipped] Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev am: 0a7c41615e am: 4e0dd1197a am: d9fb6e1236  -s ours
am: 9411ab1589  -s ours

Change-Id: Ifaed1d594440782fca8d703ddeee0469eb1d8648