Merge "Strip hinge angle sensor when running a 2.1 HAL as 2.0" am: d3e3b877ac am: 6e8d750aa3 am: 40cf1af6fd am: f5572477e4

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

Change-Id: I5ba4d5f69b279d5ea59b143c12c2dab073609dc1