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

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

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