[automerger skipped] Merge "Change setPrimaryStorageUuid to handle it for the...

[automerger skipped] Merge "Change setPrimaryStorageUuid to handle it for the current user" into rvc-qpr-dev am: 6c1e9153 am: f0544ead -s ours am: 5d9b76bd -s ours

am skip reason: Change-Id I87c821903987d22e8d26ade92120b99a33897168 with SHA-1 1c0e5ce8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11c65eb228ead2cfaec3f2e98767f8d90a02ce9d