Merge changes from topic "window_context_2.0" into sc-dev am: 582247ee

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic993a19f7cca3f10693d8313ab8d51a6a544cc19