Merge "Fix logic for logging bitmap errors" into sc-dev am: b8eac194 am: a0316957 am: d5039b48

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

Change-Id: I59da4479acabfe39bcb6207883fdb98d2a645c6e