Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into...

Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into sc-qpr1-dev am: 6cae0eda am: 20a56f06 am: 1c1cca3f

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

Change-Id: I1854e8d0af7e0a906c63ec458ee4d3d8088f9b8c