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

Change-Id: I82fa40e7efb0dc1c745fd0c7105b6153b950800f