[automerger skipped] OC-MR1 DisplayCutout XML API
am: 361580459e  -s ours

Change-Id: Ibff9a5fd9396eb54264970f02c832a7d085a9648