Merge "Merge "Don't show caption menu for things in TaskView / bubbles" into...

Merge "Merge "Don't show caption menu for things in TaskView / bubbles" into udc-qpr-dev am: 67418d25" into udc-qpr-dev-plus-aosp am: 1b22d9a9

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



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