Merge "App bubble bar bubbles crash fix" into udc-dev am: 8a5e18bc am: fa4323fe

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



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