Merge "Revert "Move @ViewDebug.ExportedProperty annotations from private fields to public methods"" into main am: b303b74e0f

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

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