Merge "Fix an issue where we might load bubbles with an invalid user id" into...

Merge "Fix an issue where we might load bubbles with an invalid user id" into udc-qpr-dev am: d915c1ad

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



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