Merge changes from topic "revert-2321957-revert-2313818-sensors_shared_convert-WBBPAAQJOV-XMCLNCHRVL" am: 593cdb0292

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

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