Merge "Move android.preference out out CtsTestStubs" into lmp-dev