Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into sc-qpr1-dev am: 6cae0edae1 am: 026f820cce

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

Change-Id: Idc52fd351f28d0c15d1020fdf7dbfea938db753e