Merge "camera 2.4: conditionally disable memory init" am: 6c6fd401a8 am: 8e69ad680f

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

Change-Id: Ibea6d3bce77764f5029a029dd19c8197f151b7e7