Merge "Release cblocks back to the free pool" into sc-dev am: 81858ab4

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

Change-Id: I3d4991f62de1a67103c7d4ebc367e5719654f619