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

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

Change-Id: I5d4a833884e9c732b9f96cd0ca6f72a889b89254