Merge "Revert "Fix issues with wrong configuration being used to inflate...

Merge "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." into nyc-dev am: a3d8c316
am: 8e13f725

* commit '8e13f725':
  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.

Change-Id: Ifee675dfc34c5233af5c2f4f90d8ccef2a6535cc