Merge changes from topic "optimize-instructions-count-b295892886" into udc-qpr-dev am: 98b3c1884d am: 7a659c79a5

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/zuma/+/24754397

Change-Id: I7ff78e5ec9dcf1d1080e20ac9c1c523bedd949ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>