Merge changes from topic "presubmit-am-7ec75ddcc57e4269a8bd00190c66c479" into...

Merge changes from topic "presubmit-am-7ec75ddcc57e4269a8bd00190c66c479" into sc-qpr1-dev am: 3c824a23 am: 17d5b1fc am: 5a277a13

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

Change-Id: Ic794d221647adc28dd14ae4ddc602773d396caf0