Merge "Remove broken record_variable_selection test from MR1 must-pass." into lollipop-mr1-cts-dev am: 67685b11a4
am: a9172fd9d6

* commit 'a9172fd9d6181368acf916af4bd7c1048676133c':