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

Change-Id: Ie29dbb55092bcfecc0f01a4ba3405ea8dd8db518