Merge "Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84 am: 32d71ab700" into rvc-d1-dev-plus-aosp am: efb5934755
Change-Id: I0cac4bd64c8f62edf83ae47c5c2b5b724bd3135c
This commit is contained in: