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

Change-Id: Ie350fe3eb0ab788a6221be0267a186b891591248