Merge changes from topic "wm-config-change-fix" into sc-v2-dev am: a4b205e2...

Merge changes from topic "wm-config-change-fix" into sc-v2-dev am: a4b205e2 am: 963e100d am: 20d028db

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

Change-Id: Iacfc1619d6a8255e8364330332f8afb098f8a187