Merge changes from topic "new-fp-strings" into sc-dev am: 77ddf11ae6
am: 28f4ca0eb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330069 Change-Id: If12a722516aa6c41c12a6d38c7ba29ca7872857f
This commit is contained in: