Merge "Revert "Revert "Revert "Revert "SharedMemory: break Cleaner reference cycle.""""" into sc-v2-dev am: 13d840f012 am: 590ca76775

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16364414

Change-Id: I36b0e653cec65a21e4c5d5c7376bdd3c7840de8a