Merge "Don't use Primary sensor when Secondary available." into sc-dev am: 00f16a79 am: 892c5527 am: 2d1d0bd0

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

Change-Id: Ie0d98d3546fa0050227c6ec65d1fef0a6d235e2f