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

Change-Id: Ic8b48650c26c0ded2f75e7a79db672665edc9d1e