Merge "Delay the transition to AOD1 if udfps is activated" into sc-dev am: 9a66f8324b

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

Change-Id: I58c4fc816ac2ac4a8a11366d8606034bdfc7756a