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

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

Change-Id: Icdc7371f08e75c45e93717adfb94693ffed5bfd3