Merge "Align Settings and SystemUI packageName references" am: 1452f7dd am:...

Merge "Align Settings and SystemUI packageName references" am: 1452f7dd am: ff6def3c am: 525b567d

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



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