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