Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev am: a24dbc064f am: 82e2ee2a19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617 Change-Id: Ie96faf70255322f537b8f270a444d5a4cf1e14fd
This commit is contained in: