Merge changes from topic "am-6918759643aa4a8c8dc627e3157a1624" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "b204906124-sc" into sc-qpr1-dev am: 25967449 -s ours am: 9037f3e9 -s ours am: 415faf89 -s ours am: 92e253a8 -s ours am: 6f585259 -s ours
  [automerger skipped] [automerge] Restrict getInputMethodWindowVisibleHeight 2p: 753331b3 am: 234ac4be -s ours am: 3abb4f56 -s ours am: 58ae8102 -s ours am: 0ee6691d -s ours am: f7d80d50 -s ours