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

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

Change-Id: I9538409797a98532c2bc7ae6e12d0859bb8e33dd