[automerger skipped] Merge "Keep same behavior after initiatingPackageName change" into udc-dev am: 6e5e43829b am: baa16cfefc -s ours

am skip reason: Merged-In I3b8639c5530782375d0b26c9a65c1662eced5493 with SHA-1 acab1045f3 is already in history

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

Change-Id: I40967c8119de689f59d972f91a487a33bf18ae39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>