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

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

Change-Id: Iedeacbf1ba44f8155d526b9c9cebc32bbdac98b6