[automerger skipped] Merge "Delay the transition to AOD1 if udfps is activated" into sc-dev am: 9a66f8324b -s ours am: ea3298f1fd -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: Icbb1158f12c0d5d5dc3914391abbf88c3cdb7454
This commit is contained in: