Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae232472 am: 7364b381 am: 7303f135

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

Change-Id: I639b43d233d7308dcca17d1676e448bf718d29c6