Merge "Move RTT system setting to Settings.Secure"
am: 151095a09e

Change-Id: I135364e8f2ab303413e85bc46991a4008d211ecd