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

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

Change-Id: Ia35dc37ad712e1993f8ea874dca1c6be3803ecfa