Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b am: 5968c28c am: 9899b404

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

Change-Id: I0094dc7ec834aa8bee2a578fe2e981ecc3a6dd6c