Merge "Merge "Camera: Use fallback key if the requested key returns null" into...
Merge "Merge "Camera: Use fallback key if the requested key returns null" into pi-dev am: 062c050d" into pi-dev-plus-aosp
am: c7a55ad4
Change-Id: I862b506697883856e6ae88a0d6c9cc90e056758f