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

Merge changes from topics "sensor_conver", "sensorservice_aidl" am: a3793499 am: 3191a512 am: 9cdab584

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



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