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