Merge "Strip hinge angle sensor when running a 2.1 HAL as 2.0" into android11-tests-dev am: 28acf0c2

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1510330

Change-Id: I079193ce25cbad1a4a41133a70faebcedee37438