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

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

Change-Id: I114751bcd4f3241e1fa50a976ffc808e970cc057