Merge "Fix that the theme of "Vision Settings" was inconsistent with "Anything else?"." into tm-dev am: 66a510d2 am: c23fa1eb

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

Change-Id: Ie81e38624d5c03bfa7d656549d9e735b0dffda33