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

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

Change-Id: Ic930169aefd2cb4b74fd6ab6ddfc62d7d8f8bda6