Merge \\"Limit global drags to apps targeting SDK 24 and above\\" into nyc-dev am: f33af2285b
am: 3d80871032

Change-Id: I2f7745317f6ae0932d7c16469b500847e465a912