Merge "Disabling flaky test until fix is found" into rvc-dev am: b20995ba8e am: b67ebcae6e am: f092e5ffde am: 9693936b9d

Change-Id: I01900f8c1ce9ab1e90c5c2589a98419cd9686c3a