Merge "Resolve requested deferral policy based on caller." into udc-dev am: 0177c5f2

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



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