am c72f1040: am da00b7ac: Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev automerge: ca0d846 automerge: 30e83c0 automerge: 76c8e3d automerge: fde9054

* commit 'c72f1040ca17ca4ba535ed1bfc7f681ff2d84302':
  Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest