Merge "Finish SensorUse activity when dialog is dismissed" into sc-dev am: e1d8d046 am: 2040013a am: 10937489 am: 32d32efa

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

Change-Id: Ifec5417609137dab4860be1ea8b5947ad7e09194