[automerger skipped] Merge "[Settings] Update EID in background" am: 1efdd7d3ba
am: 37e8cf45fd
-s ours am: fa51f02f1e
-s ours
am skip reason: Change-Id Id30851bbd0b0fe080ed703586f9718be8b97abdd with SHA-1 d1c8d2a771
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385023
Change-Id: I6b730899f147811c85abfafe9170df1af7865c9d
This commit is contained in: