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: Ifce5e0039d2bb565c7e251ae71070ffac46a8f52