Merge "Don't send mSizeCompatScale to client if it is from SizeCompatBounds"...

Merge "Don't send mSizeCompatScale to client if it is from SizeCompatBounds" into tm-qpr-dev am: d76c6279 am: 2d8d2456

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



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