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

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

Change-Id: If9d58402cd06d69d13236adf06232dbd54408a67