Merge "Added tests for QosCallback" am: 8ce48fe117 am: f4a7d4130f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1558648

Change-Id: Ic1e274100986681ac7d203ae6ad424387903e2a2