Merge "Don't call property getters during initialization." into udc-dev am:...

Merge "Don't call property getters during initialization." into udc-dev am: 3a74294b am: 5641accf

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



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