Merge "Merge "Fix SysUI / AoD leaking content observers" into qt-dev am: b755a7c16b am: 0c34b102ff" into qt-r1-dev-plus-aosp
am: d82936d616

Change-Id: I0c8998a021c0d625677bd8d7178e128ebc06bc04