[automerger skipped] Merge "Revert "SurfaceFlinger: debug layer bounds inset"" am: bfe7d2873a am: 6c437f1058
am: 1b8476601f -s ours
am skip reason: change_id Ia1687bca84361dc8f665b9c0f893b8f40c5362e1 with SHA1 b597ce5665 is in history

Change-Id: Id6bec3534374562ed3581e78bfda83c77fc85bba