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

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

Change-Id: I438557dd81d0c331133fed87fbde81fad6f6b3c0