[automerger skipped] Merge "Move RTT system setting to Settings.Secure" am: 151095a09e
am: 7f3b2981b1  -s ours

Change-Id: I7fe7a68ad44a397adff6a4a90d4d8cab2295801f