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: Iffbae66c3a7966ae3b543f2b0642ba55112791a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>