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

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



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