Merge "Revert "SharedMemory: break Cleaner reference cycle." Bug: 138422309" into qt-dev
am: d4b0c9348a

Change-Id: Ic8ff79117a25be51cccf4e1492e3dea87a045eb5