Merge "Integrate new version of MDC-android release" into sc-dev am: d8c11f5236

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

Change-Id: Ibe2ff69557dc6e3039028ecbcac7d19bb8336e85