Merge "Make face education handle timeout result correctly" into sc-dev am:...

Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b am: e2cecc12 am: d03beb3b am: bc992403

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

Change-Id: I860f0dde43ed5d692e2f0029f5d771a3e7a14936