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: 123e88c5 am: 27209312

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

Change-Id: I421fb072212374184229d1d758424f30d2c584d2