Merge changes from topic "facemanager-bypassflag" into sc-dev am: 88a506aa am: 84535904 am: 74db1332

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377220

Change-Id: I65fe742cc6d336bd30ffa3aa791cef85b6a3fe51