[automerger skipped] Merge "Re-enable the following tests in pre-submit: ...

[automerger skipped] Merge "Re-enable the following tests in pre-submit:   cts.AlarmManagerTest#testSetRepeating,   cts.SystemFeaturesTest#testSensorFeatures" am: ebe03eda am: 06097b72 -s ours am: 2d22fac6 -s ours
am: 0b8409d3 -s ours
am skip reason: change_id Iffec912af4ee9dd3de2090a31bd475abc5016854 with SHA1 02cbff44 is in history

Change-Id: I2e5209d8cdfb6fb7e4a00634bb85348a8bfdd7ac