Merge "Delay the transition to AOD1 if udfps is activated" into sc-qpr1-dev am: a888b50f am: 7e7e0d04 am: 4c210ca5

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

Change-Id: Icb2623a3e66ce332625eac12410a9c843765a6b3