[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: f77ec020 -s ours am: b3e0d34f -s ours am: 32374177 -s ours
am skip reason: Change-Id I87f04b50945e1500babdf9fa7ba9cdb37010fde8 with SHA-1 dd12316b is in history

Change-Id: I0ebddfd24f3c4adbd4c23fe6c515556631e966f6