Merge "Re-enable the following tests in pre-submit:   cts.AlarmManagerTest#testSetRepeating,   cts.SystemFeaturesTest#testSensorFeatures"
am: ebe03edac6

Change-Id: I97302a044c12353b16974f42165957ff75da6908