Merge "Delegate handle menu operations to a separate class." into udc-dev am:...

Merge "Delegate handle menu operations to a separate class." into udc-dev am: aa3a23f8 am: 280489b9

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



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