[automerger skipped] Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev am: 0a7c4161 am: 4e0dd119 am: d9fb6e12 -s ours Change-Id: I9a1dda15c8d20a7599229033ffd8ec6f6cfedf53