Merge "Sync client visibility if activity is stopped" into sc-dev am: be851a2a am: d57c3643 am: a5c4fff7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15258890

Change-Id: Ied83ed429d8443be7945f7b655a4ee9414916eb0