Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev