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

Change-Id: I5930568ca8f9aaebb3b0c80926edf8b5b62a0788