[automerger skipped] Merge "RESTRICT AUTOMERGE Refactoring settings UI" into...

[automerger skipped] Merge "RESTRICT AUTOMERGE Refactoring settings UI" into tm-qpr-dev am: 67537336 am: f315f0c8 -s ours

am skip reason: subject contains skip directive

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



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