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

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