Merge changes from topic "revert-2313818-sensors_shared_convert-WBBPAAQJOV" am: 51b7ac6e12

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

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