Merge "Automatically switch to native density for ActivityManagerMemoryClassTestConfigurationTest" into pie-cts-dev
am: 2edae29285

Change-Id: I4b2384d4548da45fb27131c6c9ebb93d93fec75c