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

* commit '2d74e17bb0fe0bf9b52332f2664460a8a54549ec':

Change-Id: I6da0fd5a265c4ccec729f1b583e5ebd6e96f164c