Merge changes from topic "presubmit-am-7ec75ddcc57e4269a8bd00190c66c479" into sc-qpr1-dev am: 3c824a23 am: 2c792049 am: 97224de6

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

Change-Id: I2c7b620a3401e14326f94cc3df254dd335515f86