Merge "Finish SensorUse activity when dialog is dismissed" into sc-dev am: e1d8d04603

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

Change-Id: I9a96117bdcf07b9080428fafaa0d3d605bb85209