Merge "Make MoreOptionsScope abstract class" into main am: 62d6ccd106

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2928196

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