[automerger skipped] Add cursor type and hotspot to surface metadata. am: c15eb91b04 am: 39d9a2fe8b -s ours am: 20384ff940 -s ours

am skip reason: Change-Id I739cd03214364144bb4e22a166ecc7abfd3492fe with SHA-1 67e479a4e8 is in history

Change-Id: Id2b113e4f1492207fa290f13f5634acd4884e507