Merge "Update usages of deprecated setDeferUntilActive() API." into udc-dev am: 6fc98811 am: ce537029

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



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