Merge "Camera: Fix memory leak if malformed face data is received" into rvc-dev am: fd267eb2 am: 6af52312

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11427417

Change-Id: I336febf8436885e436f492bd5511f72b9bc42822