[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix bb in duplicate value for...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix bb in duplicate value for resource" into sc-v2-dev am: 6d1097cb am: bb438cf9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3cc8d9747ec5a470b178199a43b4621eca08e1c0