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

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

Change-Id: I917d8c3bdecea12b9fe3679d24fd57ab32535840