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

Change-Id: I2a0088cc3a9aef5bef4b7b03e9ff6862e1b0ce6e