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

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



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