Merge "Revert "Add logs to indicate why a surface is invalid"" into sc-dev am:...

Merge "Revert "Add logs to indicate why a surface is invalid"" into sc-dev am: a67dff0d am: fcbf0495

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I576ec5b60f4eb48748f6925d88bdeee6f97eb12b