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

Change-Id: I358221beb4aa8964678f57860ecfc3501d9bc164