Merge "Add @deprecated and @return error annotations" into main am: b3229b6f86 am: cfe92f391d

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3420539

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