[automerger skipped] Merge "Update screen_share_mode_spinner to...

[automerger skipped] Merge "Update screen_share_mode_spinner to screen_share_mode_options" into aosp-main-future am: ebe16f7d -s ours

am skip reason: Merged-In I0ecd0deffa63241ee919a11781247b91c847ebb4 with SHA-1 f9c407bf is already in history

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



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