[automerger skipped] Merge "[DO NOT MERGE] [RESTRICT AUTOMERGE] Fix bb in...

[automerger skipped] Merge "[DO NOT MERGE] [RESTRICT AUTOMERGE] Fix bb in duplicate value for resource" into sc-v2-dev-plus-aosp am: cd02a573 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I053d95200eade5612ea49c730b933657eabae7b8