Merge "Add prebuilt_etc for go_handheld_core_hardware.xml" am: 1b22fc84b9 am: dbf0a32fef am: 8848aa8fb2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1957443

Change-Id: Ie66c954fd25366780229eda6068ee0a0a11aa68a