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

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



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