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

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

Change-Id: I54529aec3d7afe36913c52356816f082f8df2113