Merge "Merge "Add Enhanced Connectivity To Backup Tests" into rvc-dev am: bdfcea34 am: afbecc75" into rvc-d1-dev-plus-aosp