Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev
automerge: ca0d846

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