Merge "Switch to using override type enum" into main am: cfa146da59 am: 2b0b93e3f1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3260212

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