Merge cherrypicks of [16576160] into sc-platform-release. am: 6cdb50140c

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

Change-Id: Ieac5525bd5bd370742673b213ec67aa82ad09fdf