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

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

Change-Id: I34c1e785a4b8439c32b5343ef0945ac57a61f41a