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

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

Change-Id: I5cd3a8b4ca6a05228cb72dbdcbe00bf6721b288f