[automerger skipped] Merge "Import the window extension libary in the Settings app" into sc-v2-dev am: a1b8347ae4
am: bdbe97f958
-s ours
am skip reason: Merged-In If9040ae9a1c72097e4964c8d40ea9785cf2f01dc with SHA-1 18ad0c49a8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15595088
Change-Id: I2a5589ef30857b66568dec24a68a6a66a360dc88
This commit is contained in: