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 'da00b7ac4188608f15d26c48e7db678d85736c96':
  Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest