am b83bba7c: Merge "Log noisily on uid vs user-handle confusion in the settings provider" into klp-dev

* commit 'b83bba7c353de6ac1af7c5770c48d1f323acb97e':
  Log noisily on uid vs user-handle confusion in the settings provider