[automerger skipped] Merge "Update the sdk doc of Default & ShortEdge cutout...

[automerger skipped] Merge "Update the sdk doc of Default & ShortEdge cutout mode" am: bd8fb458 am: 8e3584ed am: 68a72800 -s ours

am skip reason: Merged-In I8c83cde40f321de2a301b5865445ff765c824d43 with SHA-1 b76fdc56 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1989886

Change-Id: I7abf9aee2314c1c3fb4b0a425a877ca598c46bc0