Merge "Merge "SharedMemory: break Cleaner reference cycle." am: 5783a79cfc am: e9c55ddce1 am: 132b66b0c2" into qt-r1-dev-plus-aosp
am: 5b8cf85d76

Change-Id: Ib23ad98bfa21ed13eb74fbf104a23a7962498742