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

Merge changes from topic "wm-config-change-fix" into sc-v2-dev-plus-aosp am: 34ef47d2 am: 297651ef

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

Change-Id: Ib7b364dc606dc33a1f65289dd560a22a58087dbd