am 21e5d240: am 70a82d9d: Add null check in AndroidCameraSettings.

* commit '21e5d2401d605b31bccd6357da4ee7c49cf08aed':