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