Merge "Reconciled description of WindowManager with description of Context#createDisplayContext()." am: 92a4b54de5 am: 98951a99f4

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

Change-Id: Icb9a08416599e1dcad31e146a2b8f82bb1ef8281