Merge "Merge "Revert "Disabling flaky test until fix is found"" into rvc-dev am: 77762fdf4f am: 06aae1303c" into rvc-d1-dev-plus-aosp am: 6d699286d9 am: dd19d13701

Change-Id: Ic1600686ac86b6152f104e151bb041e5c02fac55