Merge "Fix regression of pressing power key cancel sfps enrollment" into...

Merge "Fix regression of pressing power key cancel sfps enrollment" into tm-qpr-dev am: b9263732 am: 37785c81

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880527



Change-Id: Id4de390f6bf0276795ca1f73759a2172e25ef7e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>