Merge "Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff am: 394955220f" into sc-v2-dev-plus-aosp am: c43ed2759b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643 Change-Id: I7769ddf256b1ced4e8b3ea3c747a60a17b99451c
This commit is contained in: