Merge "Use launcher namespace instead of settings-ui namespace." into...

Merge "Use launcher namespace instead of settings-ui namespace." into udc-qpr-dev am: d78136fe am: 713c4b3b

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



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