Merge "DisplayContentTests: Mark and improve flaky test" into pi-dev am: deea3b84ab
am: 1c7d761692

Change-Id: Id2aeb409c957eb7e225bba9a7d9c06903df80e4e