Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073 Change-Id: I0c107d09b4793a6c16b86a559bebc1a5e92e6e96
This commit is contained in: