[automerger skipped] Merge "Allow NOT_SUPPORTED for setLinkCapacityReportingCriteria on GERAN." into pie-vts-dev
am: 429da8656e  -s ours

Change-Id: I7b4bcef51732df6264958cda4d2d290f49cba505