Merge "Reland "Enable CORE_DEFER_UNTIL_ACTIVE by default"." into udc-dev am: a4edd78c

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



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