Merge "AppOps check for secondary user"
am: 6895e032e7

Change-Id: I6af39224f12b6612f21bd73dfe6433f3e6a8931a