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

Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into sc-qpr1-dev am: 6cae0eda am: 026f820c am: 89859355

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

Change-Id: I866e31cf34fafe2cdb5b8fdbfc1358a71a57d5cb