Merge "Make final factors configurable." into tm-dev am: 36639869

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



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