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

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

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