Merge "Move LayerType @ViewDebug.Exported annotation from private field to public method" into main am: 5314b09104 am: 9a1e46321c

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

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