Merge changes from topic "sensors_shared_convert" am: 82c3b18f55

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

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