Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-mainline-prod am: dc217a8213
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617 Change-Id: I2daeffe1ff82dde50ff92065d3fceb5b0fffe84b
This commit is contained in: