[automerger skipped] Merge "Fixed DisplayCutout flaky test" am: 74c6a9785a am: d4d4909f67 -s ours am: a211dac6a5 -s ours am: 4896523b15 -s ours am: 8efc38b878 -s ours
am skip reason: Change-Id I1d5663ebd8588021387b7ae5296851769954f996 with SHA-1 7dabcab3dd is in history

Change-Id: Ic751537d4cb2a691573788d684fd842237aeeaa2