Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev
am: 0a7c41615e

Change-Id: I259380ed027d31c4b8292f366590f0757f540766