Merge "[Settings] backport missing CL" am: a8ee80e95a am: 15c0678ca8

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

Change-Id: I687c80bc2f50b242151edffdb8ab97307d08b9d9