Merge "[bbq] always update size if scaling mode changes to non freeze" into...

Merge "[bbq] always update size if scaling mode changes to non freeze" into udc-dev am: cd4abe68 am: 7733971b

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



Change-Id: I6fd58a873d473ff7f4d72e0d248a8d7456373415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>