Merge changes from topic...

Merge changes from topic "revert-2321957-revert-2313818-sensors_shared_convert-WBBPAAQJOV-XMCLNCHRVL" am: 593cdb02 am: 55de842b

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



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