Merge changes from topic "presubmit-am-506ed0de8ea142bfad638ac768dad4cd" into tm-mainline-prod am: 79cc005ee3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352026 Change-Id: I3c15656e901f8bbcc90fd6ce484c45556925eb0c
This commit is contained in: