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

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

Change-Id: Ifa148c303ac23fa6081fad3142b6c65e0624d782