Merge "Move RTT system setting to Settings.Secure" into pi-dev am: 95821c2b3e
am: ccc7b30e5b

Change-Id: Ia6e4fcad8eaf0100dc5abd2e28aa0bba8ac13bce