Merge "Fix out-of-memory error." am: f4a9ee68a3 am: 3086bb11c9

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2231087

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