Merge "Merge "Postpone the shared user checking after Q" into qt-dev am: 3f124d6463 am: ceaa7d45d2" into qt-r1-dev-plus-aosp
am: 38125a1804

Change-Id: I46d0a45c0c9defda60a966233a7a35932891a93a