Merge changes from topic "revert-2313818-sensors_shared_convert-WBBPAAQJOV" am: 51b7ac6e12 am: 42aa817079 am: 00878b2a3c

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

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