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

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

Change-Id: I894941a064dc61c68722036081f0617c47804c83