[automerger skipped]Merge "Factor out a menu class for screen ui" am: 549695ae65
am: baf619c21c  -s ours

Change-Id: Ifad3c7245cbf8770825f1ca3919ccd9169bf5f18