Merge "Remove SK_SCALAR_IS_FLOAT checks, they are always true" into udc-dev am: 7b54669a

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



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