Merge "Verify WindowContext gets custom Drawable" into sc-v2-dev am: 0ef22432a8 am: ef0bbb8f6e

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

Change-Id: Ib957e1d833f92abcbf98a1f6dacd8fa627f0222c