Merge "Move @ViewDebug.ExportedProperty annotations from private fields to public methods" into main am: 61798ad0b1 am: 7cc5c39ca0 am: 4bc33825eb am: bf82583834

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

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