Merge "Show Bubble OOBE on the first conversation bubble only" into udc-dev...

Merge "Show Bubble OOBE on the first conversation bubble only" into udc-dev am: ac5394a4 am: 8f98c0f9

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



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