[automerger skipped] Merge "Add DEBUG flag for rounded corner and display...

[automerger skipped] Merge "Add DEBUG flag for rounded corner and display cutout path" into qt-qpr1-dev am: 353d26c8 -s ours am: 30d7e1c3 -s ours am: 6d47e159 -s ours am: 771a5275 -s ours am: db397ed6 -s ours
am skip reason: Change-Id I87f04b50945e1500babdf9fa7ba9cdb37010fde8 with SHA-1 dd12316b is in history

Change-Id: I9682bc87f678df79c2da083205933e08a7ea2899