Merge "Make MoreOptionsScope abstract class" into main am: 71e30e5cfc

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

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