Merge "Don't call property getters during initialization." into udc-dev am: 3a74294b3c am: 5641accf97 am: 0f291f94eb am: 6f7079a067

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

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