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 am: a0462e4c

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

Change-Id: Ia946dc53d2a6b90bfeb232c42f640ae40ed8b4d4