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