Merge "Fix ClassLoader issue of WindowContext" into sc-v2-dev am: a9efae988e

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

Change-Id: Ic67fdb922f1abd974b72c3ec029d10e3653180a7