Merge "[RESTRICT AUTOMERGE] Fix bb in duplicate value for resource" into sc-v2-dev am: 6d1097cb39

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15683508

Change-Id: I533ec06313d70c4abb48ef9295aa43c910a781c4