Merge changes from topics "sensor_conver", "sensorservice_aidl" am: 3259213a am: fd2903c2

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2298582



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