Merge changes from topics "sensor_conver", "sensorservice_aidl" am: a3793499

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



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