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

Change-Id: Ibcc4e2ec74730ed839d9970ccf5049cae77b06da