Merge "Enforce infinite-deferral policies only with modern queue enabled."...

Merge "Enforce infinite-deferral policies only with modern queue enabled." into udc-dev am: 22c273d7

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



Change-Id: I6a80248ed11370f28dc20cf05280ac7d4cb3991e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>