[automerger skipped] Add cursor type and hotspot to surface metadata. am:...

[automerger skipped] Add cursor type and hotspot to surface metadata. am: c15eb91b am: 39d9a2fe -s ours am: 20384ff9 -s ours am: 53d217fa -s ours am: 680a163b -s ours

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

Change-Id: I0ded61a9c9208b11b96addf30533dd6662147098