Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286

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

Change-Id: I5307234cb034d2f255307cbcff5ebee1a470d79b