Merge \"Fix docs for View.DRAG_FLAG_GLOBAL am: 9a44eaec53 am: 8496bb82d2\" into nyc-mr1-dev-plus-aosp
am: f7d96e5557

Change-Id: Iffb3086a366f99246510e79e489e5d30ae11ec78