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: a4315d03

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



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