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

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

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