RESTRICT AUTOMERGE Empty commit in qpr-dev to avoid merging the change from udc-dev

Also the files were moved to a new package in udc-qpr-dev. This cherry-pick is required to resolve that conflict as well.

Bug: 282763277
Test: everything builds, will verify by comparing the strings in the generated apk.
Change-Id: Iecd0215b70ed2b66bdf1b3a9431bb03275911bac