Merge "Merge "Revert "SharedMemory: break Cleaner reference cycle." Bug: 138422309" into qt-dev am: d4b0c934 am: 868ac4f3" into qt-r1-dev-plus-aosp