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

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

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