Merge "Fix out-of-memory error." am: f4a9ee68 am: 3086bb11 am: fa6d6746...

Merge "Fix out-of-memory error." am: f4a9ee68 am: 3086bb11 am: fa6d6746 am: 5872d55a am: c5bc4643

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



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