[automerger skipped] Merge changes from topics "cursor_type_hotspot",...
[automerger skipped] Merge changes from topics "cursor_type_hotspot", "set_viewport_in_input_reader" am: 43beafe0 am: 036b105b -s ours
am skip reason: Change-Id Ie7a9546550b70c8834462b06de929472196fe713 with SHA-1 888a6a41 is in history
Change-Id: Ief69a7d420179ad03b0ab8fff2a0182bae220990