Merge "Throw Exception only if sensors are in capped set." into sc-dev am:...

Merge "Throw Exception only if sensors are in capped set." into sc-dev am: e55a9d90 am: bce57b1f

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

Change-Id: I15618a944aafd4d6d8fcdfae1f794214f8275233