Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev am: 794482fb92

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12410582

Change-Id: I84db13dbe58d05cb8639515e302b927c00342662