Merge "Do not get setting if targetUserId == UserHandle.USER_NULL" into qt-r1-dev
am: a9247e4913

Change-Id: I09700bf5955f30ca54d5c851ff5fa1dd1487823b