Merge "Fix a test for system properties in frameworks/base/core"