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