[automerger skipped] Merge "Only update cache for new user on user create"...

[automerger skipped] Merge "Only update cache for new user on user create" into sc-dev am: 5184f16d am: 514b3df4 am: c5781ac3 -s ours

am skip reason: Merged-In I09cb9f98b34d86ae678373d3f61dd5fdd334cfb7 with SHA-1 d978d634 is already in history

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

Change-Id: Id3404aa9b3f118fcfbf1385e684e4e52e0c051b8