Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into...

Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec am: a87573a5 am: 740cc82a

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

Change-Id: I83eaf234db994f34dbdedfe95494f198e648190a