[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 skip reason: Change-Id I739cd03214364144bb4e22a166ecc7abfd3492fe with SHA-1 67e479a4 is in history
Change-Id: I322505fa83b5347c5e73f0912853691c3fed0333