Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64
am: a87573a588
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952 Change-Id: Ia6fb3dc66c83dd6908012265d74700bf4853ee05
This commit is contained in: