Merge "Merge "Fix condition where FP would require confirmation" into sc-dev...

Merge "Merge "Fix condition where FP would require confirmation" into sc-dev am: c52f2f06 am: 0ccccb8c" into sc-v2-dev-plus-aosp am: b74b1bee

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

Change-Id: Ibbe27b0a46c83c137a138a555ddd09049a2264be