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

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

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