Merge "Fix condition where FP would require confirmation" into sc-dev am: c52f2f069f

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

Change-Id: I49183f60d343afa784c88177983ba93d90321612