[automerger skipped] Merge "Make MoreOptionsScope abstract class" into main am: 71e30e5cfc am: 5bfb209a5e -s ours

am skip reason: Merged-In I8399bd486b0001749af76b3393898d930bd2b7af with SHA-1 a517f66c00 is already in history

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

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