Merge "Check device owner by callingUid in ActivityStarter" into qt-dev
am: ab48af4b76

Change-Id: I95e75f238ff39bd0dd6c8bc174bfb2fc451c440d