Merge changes from topic "presubmit-am-a4b5fed487654d059d858e79df0cd2fb" into tm-mainline-prod am: f6fb17fcb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353323 Change-Id: Iea4285a0353c4f8cc4361d0bd3e75cfd66810bf9
This commit is contained in: