Merge changes from topic "presubmit-am-79923e45dbeb447a849c3ed6d03e96f1" into...

Merge changes from topic "presubmit-am-79923e45dbeb447a849c3ed6d03e96f1" into tm-mainline-prod am: f4f09c44

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Change-Id: I27478be8b332678c8e5fddde80338f39110beffe