Merge "Improve Settings launch performance for normal phones" into udc-dev am: 75e591e4

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



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