Merge "Change setPrimaryStorageUuid to handle it for the current user" into rvc-qpr-dev am: 6c1e915306

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13438906

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25ef90ea0542ebaa4ea300a6c43906e469a3b840