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

Change-Id: Ieb3fb05b4a5f0813fc03a0cf3d8ca77c0dd8308d