am be8900a9: am 4754428d: am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev

* commit 'be8900a96b72d26c987feb63432541f721c06c21':
  camera2: Fix null check in PictureCallback.