[automerger skipped] Merge "[Settings] Update EID in background" am:...

[automerger skipped] Merge "[Settings] Update EID in background" am: 1efdd7d3 am: 37e8cf45 -s ours am: fa51f02f -s ours am: 45813847 -s ours am: 35dfa9c6 -s ours

am skip reason: Change-Id Id30851bbd0b0fe080ed703586f9718be8b97abdd with SHA-1 d1c8d2a7 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385023

Change-Id: I7d478db00b03fe88c3dee8d36c3063a635c4141b