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

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

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



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