[automerger skipped] Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev-plus-aosp
am: 88de4328 -s ours
am skip reason: change_id If2b813f24cf5998829fe417e32179c5e8283d308 with SHA1 0c47113a is in history
Change-Id: I35a625ba0a09a0a35da1f38795dc34201838a084