Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406"

Framework bug was fixed by ag/900274, so this is no longer needed.

This reverts commit 062efd0f.

Change-Id: I8ebfad33420d908444910a2feffa09661b0542ff