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: 6a9f3769" into rvc-qpr-dev-plus-aosp am: 552975f4

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

Change-Id: I375122e679601fec2233daf211c0281548e32657