Merge "Merge "Increase defensiveness of Incoming Header placement" into...

Merge "Merge "Increase defensiveness of Incoming Header placement" into rvc-dev am: 7e7b180d am: a8f6a41f am: e4579c04" into rvc-qpr-dev-plus-aosp am: 1bb82383

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

Change-Id: I9ab96d4951ccc67b13e6d570b870fbcb84f18e88