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

[automerger skipped] Merge "Change setPrimaryStorageUuid to handle it for the current user" into sc-dev am: 2363cb62 am: 2687e684 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3106a08046ec9216ccd16f063e6b70ba44c60889