Use TwoTargetPreference to replace customized layout

Bug: 139336138
Test: manual, robolectric
Change-Id: I0ffe90cd9ab5423b533507eeae47d5972704cf61
5 files changed