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

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

Change-Id: I4b732b59e5c4446766bff1069907fccc568f6774