Merge "Fix condition where FP would require confirmation" into sc-dev am: c52f2f069f am: 975ca3239f am: 76c8728469
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413720 Change-Id: Ia307e2fcef79290b64135ae5c3001eb807abb430
This commit is contained in: