Merge "Added condition to prevent menu from opening while screen is locked" into udc-dev am: bfd1a287 am: a17ec1ab

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



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