Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev am: 1b857d20ac
am: 0522bb8e22
am: 813cd1750b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513 Change-Id: I393434a118480c218d8ab4f12430c0952f15412b
This commit is contained in: