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

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

Change-Id: I9daa7097f9eb47a18bc1d99b47e92c93e544ce85