Merge "Remove conversation related options in bubble manage menu" into udc-dev am: 61e0c88a

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



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