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

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

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