Merge "Add @TestApi to SystemApis in SystemProperties Test: build and flash Android Bug: 143620678"