Merge "Remove conversation related options in bubble manage menu" into udc-dev...

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

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



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