Merge "Adds capability for configuring NSA CDRX for cmx500 controller" into main am: 116f28c6f6 am: 046619153b

Original change: https://android-review.googlesource.com/c/platform/tools/test/connectivity/+/2752078

Change-Id: I9ee361d53dd0d6eaddcf8da370960342e568fb1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>