Merge "Let phone_setup_on_rat and is_phone_in_call_on_rat support 5G NSA" am: 72cd5465ec am: 2cf1d88032 am: 1927b73ec6

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

Change-Id: I231086515fd475dc7b11e7a51ca86c832e905da8
tree: 12da79e989dd19224dffe43f5ef092950303c525
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. OWNERS
  7. PREUPLOAD.cfg