Merge "Prepare for Sensorservice HIDL being deprecated" am: 14e32e179e am: c0032ae469

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2242346

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