Merge "Update the sdk doc of Default & ShortEdge cutout mode" am: bd8fb4581e am: 8e3584edd0

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

Change-Id: I635df81e55c08787647f400864e6212d01c20ef3