Merge "Committer: Rajdeep Dua <rajdeep@google.com> Test cases for android.preference"