Merge changes from topic "facemanager-bypassflag" into sc-dev am: 88a506aad4 am: e26e9b4773 am: 790cd8e2d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377220 Change-Id: I42ab852021248c2c4249af21de2dac14c2edac80
This commit is contained in: