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

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

Change-Id: I68e14a48ec493a3bfbd40f9e05e9ba90a3f0e496