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: ba5cb2cd

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



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