Merge "[automerger skipped] Update prebuilt_etc package name. am: 1f4f211d8d -s ours am: 9162939341 -s ours" into rvc-d1-dev-plus-aosp