Merge "Move RTT system setting to Settings.Secure"
am: 9a51f07117

Change-Id: I226e9a91725f7755595c3530162829f8bf61b135