Merge "Clear BCB if space allocation failed" am: b667621f8b am: b83bb72fb7 am: 0bbc41378b

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

Change-Id: Ia8aa6e797c1d59385b2762a788770478737e158f