Merge "Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf am: ce290a75" into nyc-mr1-dev-plus-aosp