[automerger skipped] Merge "Minor refactor to mark fields with respective...

[automerger skipped] Merge "Minor refactor to mark fields with respective annotations." into udc-qpr-dev am: 643caf07 am: fd4f386d -s ours

am skip reason: Merged-In Ia68d52f1c8ce95ff8d838ce4fd1b3b30675b91bf with SHA-1 f4c751e9 is already in history

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



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