[automerger skipped] Merge changes from topics "cursor_type_hotspot",...

[automerger skipped] Merge changes from topics "cursor_type_hotspot", "set_viewport_in_input_reader" am: ed6b129e am: 5b06ad52 -s ours am: c52e390c -s ours am: deb6365e -s ours am: 95d50b55 -s ours

am skip reason: Change-Id I2e48e7ac4700e6f9fdf939a7bd0e6639b051ade6 with SHA-1 be845950 is in history

Change-Id: I4e68d6619ad98d1304e95f16011c66762bf9769b