Merge changes from topics "sensor_conver", "sensorservice_aidl" am: 3259213a9e am: fd2903c283 am: 87fd3220be

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

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