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

Change-Id: I904045979a1f84f5266a3c2d08a80c7106b27589