Merge "Fix setType() return value for high angle sensor" am: 5a2d80de45 am: 89d18e94e4 am: 1e97e64bf2 am: a57b4b75c5

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

Change-Id: I4a6974cab2f97b5c9f2a550c99857788592f3db1