[automerger skipped] DO NOT MERGE: Move updateSatelliteBlacklist after...

[automerger skipped] DO NOT MERGE: Move updateSatelliteBlacklist after handleInitialize am: 5f549c40 am: c2c88112 am: eebeba29 am: 1eb2510f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icef416a3008f5ddac498525b2e3334f5f92fc6f5