Merge "Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am: 2002061f am: 6b9371ce" into nyc-mr1-dev-plus-aosp