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

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

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



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