[automerger skipped] Merge "Delay the transition to AOD1 if udfps is activated" into sc-dev am: 9a66f8324b am: bae68062ad -s ours am: 6368bb3f95 -s ours am: 17ddfbbcd2 -s ours
am skip reason: Merged-In I3a8168e6f1970c36717e0a7a223bcc74c3ec5600 with SHA-1 c87d7f79ca is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15838199
Change-Id: I4d97d488e0eb060d2e71480742877b3e58131b96
This commit is contained in: