Merge "For pre-N apps, keep entered all parents of an drag-entered child." into nyc-mr1-dev am: 0ef6986379 am: a6cbf1f668
am: 1e707316bc

Change-Id: I9f11a0957cac6ec2cdff2c9c6d6e5cc40e380cff