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

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

Change-Id: Ic3a049978ec2e71014963b417339587360fb1bd4