[automerger skipped] Merge changes from topics "cursor_type_hotspot", "set_viewport_in_input_reader" am: 43beafe0b0 am: 036b105b6e -s ours am: fede9d59a8 -s ours am: c1a90ca320 -s ours

am skip reason: Change-Id Ie7a9546550b70c8834462b06de929472196fe713 with SHA-1 888a6a41ed is in history

Change-Id: I7ea87bc774ebd69f3d2ec24c9b7618eec1db5686