[automerger skipped] Merge "Add DEBUG flag for rounded corner and display cutout path" into qt-qpr1-dev am: 353d26c897 -s ours am: 30d7e1c32e -s ours am: f77ec02089 -s ours am: 019aefb90d -s ours
am skip reason: Change-Id I87f04b50945e1500babdf9fa7ba9cdb37010fde8 with SHA-1 3bf9ca2727 is in history
Change-Id: I226c24296b6eb52c4bc93f8137b7c023551d9a5a
This commit is contained in: