[automerger skipped] Merge "Delay the transition to AOD1 if udfps is...

[automerger skipped] Merge "Delay the transition to AOD1 if udfps is activated" into sc-dev am: 9a66f832 -s ours am: ea3298f1 -s ours am: 4630c1bb -s ours

am skip reason: Merged-In I3a8168e6f1970c36717e0a7a223bcc74c3ec5600 with SHA-1 c87d7f79 is already in history

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

Change-Id: I2584c254543bd3e091174163b206ffde0f0231e3