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

Change-Id: I22ccd9d69b18f47f767feaa6c4736d9853b54c2a