Merge changes from topic "presubmit-am-186dac0b6d4f44a59e4bc743cd0fd9b4" into tm-dev am: 2d8cc15ec7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17206624 Change-Id: Ia84f0a481eec762aa0342dbb49ae0df604b58267
This commit is contained in: