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

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



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