Merge "Minor refactor to mark fields with respective annotations." into udc-qpr-dev am: 643caf07

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



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