Merge "Stop serving frameworks.sensorservice on new devices" into main am: d767636b78 am: 1481ca1760 am: 893a2e4257

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2612032

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