Merge "Add a flaky test into known-failures." into oreo-cts-dev am: 28351ba9d0 am: ffff5c5ac7
am: e04d91b14d

Change-Id: I2f469a0e54db54212d33615620a4e88649ac29c8