Merge "Fix some doxygen issues." into main am: a92a88f6f4 am: 3abe091f59

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3391721

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