Revert "Don't add other's child as header or footer"

This reverts commit 358d0d329785a225449aa9c8aea7fcc2c7bec741.

This CL resulted in b/37933333 regression, so it'll have to re-land with a target API check.

Change-Id: I1c2e4de43a15c1851d98f6aff432585ada80fb5b
(cherry picked from commit 48fef8ce495dc140b8cda1d198de766f76709381)
1 file changed