Merge "Add missing "override" annotations" into main am: 3b7bc1dd91 am: 8b63de41dd

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

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