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

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

Change-Id: I725d7a2efdaec2a4eeb5a670e8996d72ec359a0a