Merge "Add missing override" into sc-dev am: 757f24e387

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

Change-Id: I256c05c77ee1c6ad7eac7fa27ef49856662e85f2