Merge "Reset override config when clearSizeCompat" into sc-v2-dev am: 3303217286

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

Change-Id: I871ee9179d55226abb7ffbb6558fbcecf0223394