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

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

Change-Id: Id2fefe8f9fae524b62e7b119528fa7cb96e3992c