Merge changes from topic "presubmit-am-13220b28dc894f18bfa659ed22407a5c" into tm-dev am: 7702e0efbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353734 Change-Id: Ib81820c43345ff7287465cf2789739452d48cd21
This commit is contained in: