Merge "Fix inflation using themed LayoutInflater" into nyc-support-25.2-dev
am: 19f2e102cd

Change-Id: If5f566fcbc3e9e657f453cb024cd0c02a37b4353